Merge branch 'master' of http://git.denx.de/u-boot-sunxi
authorTom Rini <[email protected]>
Tue, 26 Jan 2016 22:45:37 +0000 (17:45 -0500)
committerTom Rini <[email protected]>
Tue, 26 Jan 2016 22:45:37 +0000 (17:45 -0500)

Trivial merge